Autogenerated HTML docs for v1.6.1-rc2-14-g5363d
diff --git a/git-mergetool.html b/git-mergetool.html index 41d156b..7bbcd0b 100644 --- a/git-mergetool.html +++ b/git-mergetool.html
@@ -352,7 +352,7 @@ can configure the absolute path to kdiff3 by setting <tt>mergetool.kdiff3.path</tt>. Otherwise, <em>git-mergetool</em> assumes the tool is available in PATH.</p></div> -<div class="para"><p>Instead of running one of the known merge tool programs +<div class="para"><p>Instead of running one of the known merge tool programs, <em>git-mergetool</em> can be customized to run an alternative program by specifying the command line to invoke in a configuration variable <tt>mergetool.<tool>.cmd</tt>.</p></div> @@ -367,7 +367,7 @@ of the file to which the merge tool should write the result of the merge resolution.</p></div> <div class="para"><p>If the custom merge tool correctly indicates the success of a -merge resolution with its exit code then the configuration +merge resolution with its exit code, then the configuration variable <tt>mergetool.<tool>.trustExitCode</tt> can be set to <tt>true</tt>. Otherwise, <em>git-mergetool</em> will prompt the user to indicate the success of the resolution after the custom tool has exited.</p></div> @@ -388,7 +388,7 @@ </div> <div id="footer"> <div id="footer-text"> -Last updated 2008-10-31 11:28:41 UTC +Last updated 2008-12-10 08:33:20 UTC </div> </div> </body>
